From: Lars Magne Ingebrigtsen Date: Sat, 16 Jul 2011 18:27:08 +0000 (+0200) Subject: Use the same condition for POLL_FOR_INPUT in both keyboard.c and process.c X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2792 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e48e2243332183259680c8624f414f93ec773d27;p=emacs.git Use the same condition for POLL_FOR_INPUT in both keyboard.c and process.c --- diff --git a/src/ChangeLog b/src/ChangeLog index 583887c7750..a3ff43de418 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-07-16 Lars Magne Ingebrigtsen + + * process.c: Use the same condition for POLL_FOR_INPUT in both + keyboard.c and process.c (bug#1858). + 2011-07-09 Lawrence Mitchell * gnutls.c (Qgnutls_bootprop_min_prime_bits): New variable. diff --git a/src/process.c b/src/process.c index 1a884357b86..236c27e5c3a 100644 --- a/src/process.c +++ b/src/process.c @@ -245,7 +245,7 @@ static void create_pty (Lisp_Object); /* If we support a window system, turn on the code to poll periodically to detect C-g. It isn't actually used when doing interrupt input. */ -#ifdef HAVE_WINDOW_SYSTEM +#if defined(HAVE_WINDOW_SYSTEM) && !defined(USE_ASYNC_EVENTS) #define POLL_FOR_INPUT #endif